GtkButton: Pick up images that are set early

We were failing to construct the child if an image was set
before constructed (e.g. in the init() function of a button
subclass).

https://bugzilla.gnome.org/show_bug.cgi?id=753048

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index bb90dafe3d0089446e6f049ebeed146e1507f9ec..8abbcebe317b0660b2268b88ea91fcc603884573 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -720,7 +720,7 @@ gtk_button_constructed (GObject *object)
 
   priv->constructed = TRUE;
 
-  if (priv->label_text != NULL)
+  if (priv->label_text != NULL || priv->image != NULL)
     gtk_button_construct_child (button);
 }